Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 21 Jan 2010 15:43:05 +0000 (23:43 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 21 Jan 2010 15:43:05 +0000 (23:43 +0800)
commit98a06c6e3f184bbdfbc17aad4143a91fb0c6441a
treec61a9736facc16c90f22e024727e13a06f1ee99a
parentf3d14af99f49b1db61f395614c0ba92bc9990b90
parent50f5d98a0bfff0b3f0beb7a8333977b7abae4740
Merged from trunk